Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-308

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/textmodes/ispell.el
Simple merge

diff --cc src/w32fns.c
Simple merge